* mail/rmail.el (rmail-yank-current-message): Leave point at correct position.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a4368364d0f4b75256e7c1f77ba5d26328d9896..0321ac88321b161c4b4bbf29faa9cad1401610df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,11 @@
 
        * Version 24.1 released.
 
+2012-06-01  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmail.el (rmail-yank-current-message):
+       Leave point at correct position.  (Bug#11660)
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * allout-widgets.el: Fix code header

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f8e7b405b96c032437c6e9a31258a81a4b115c0a..18f89737f199e9d83b71925564af6bf2b1f69adc 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3567,7 +3567,7 @@ If BUFFER is not swapped, yank out of its message viewer buffer."
   (with-current-buffer buffer
     (unless (rmail-buffers-swapped-p)
       (setq buffer rmail-view-buffer)))
-  (insert-buffer buffer)
+  (insert-buffer-substring buffer)
   ;; If they yank the text of BUFFER, the encoding of BUFFER is a
   ;; better default for the reply message than the default value of
   ;; buffer-file-coding-system.